FVP: Always assume shifted affinity with MT bit

At present, the MPIDR validation on FVP relies on MT bit set along
with shifted affinities. This currently is additionally dependent
on the FVP model being of variant C. This however should be based
on the presence of MT bit alone.

This patch makes the change to always assume that the affinities
are shifted in the FVP model when MT bit is present.

Change-Id: I09fcb0126e1b38d29124bdeaf3450a60b95d485d
Signed-off-by: Isla Mitchell <[email protected]>

diff --git a/plat/arm/board/fvp/fvp_common.c b/plat/arm/board/fvp/fvp_common.c
index c1dcc02c60cab221bd0017438e981cbb9f862942..d6b9820ce4c57fc358070f88389bc37c3ab9d2d9 100644 (file)
--- a/plat/arm/board/fvp/fvp_common.c
+++ b/plat/arm/board/fvp/fvp_common.c
@@ -219,8 +219,7 @@ void fvp_config_setup(void)
                        arm_config.flags |= ARM_CONFIG_FVP_HAS_CCI400;
                        break;
                case REV_BASE_FVP_REVC:
-                       arm_config.flags |= (ARM_CONFIG_FVP_SHIFTED_AFF |
-                                       ARM_CONFIG_FVP_HAS_SMMUV3 |
+                       arm_config.flags |= (ARM_CONFIG_FVP_HAS_SMMUV3 |
                                        ARM_CONFIG_FVP_HAS_CCI5XX);
                        break;
                default:
@@ -232,6 +231,14 @@ void fvp_config_setup(void)
                ERROR("Unsupported board HBI number 0x%x\n", hbi);
                panic();
        }
+
+       /*
+        * We assume that the presence of MT bit, and therefore shifted
+        * affinities, is uniform across the platform: either all CPUs, or no
+        * CPUs implement it.
+        */
+       if (read_mpidr_el1() & MPIDR_MT_MASK)
+               arm_config.flags |= ARM_CONFIG_FVP_SHIFTED_AFF;
 }